Fix NPE in Storage with Mass Ingestion and Compartment Interceptor #6598
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…compatibility in mass ingestion mode
|
Formatting check succeeded! |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## rel_8_0 #6598 +/- ##
==========================================
Coverage ? 83.52%
Complexity ? 28591
==========================================
Files ? 1798
Lines ? 111245
Branches ? 13969
==========================================
Hits ? 92912
Misses ? 12343
Partials ? 5990 ☔ View full report in Codecov by Sentry. |
TipzCM
approved these changes
Jan 9, 2025
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java
Outdated
Show resolved
Hide resolved
| false); | ||
| } | ||
|
|
||
| protected DaoMethodOutcome doUpdateForUpdateOrPatch( |
There was a problem hiding this comment.
This multiple method thing is exactly why i think we should make a new parameters object and have that API be the 'main' one.
Multiple overrides and multiple methods will lead to funny bugs if people make methods with different 'combinations' of parameters.
There was a problem hiding this comment.
Refactored out a parameters object. Thanks for the review!
…E-mass-ingestion-with-patient-compartment-interceptor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What was done:
Fixed a couple bugs relating how different settings interact with the Patient Compartment Enforcing Interceptor:
ResourceCompartmentUtil#getPatientCompartmentIdentity()(used by the interceptor) would throw a NPE when the provided resource isnull. Fixed by adding a null check.null. Fixed by ensuring resource is not set to null if the interceptor is present.Closes #6599